Merge from emacs-24; up to r111343
authorGlenn Morris <rgm@gnu.org>
Sat, 20 Apr 2013 19:11:25 +0000 (12:11 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 20 Apr 2013 19:11:25 +0000 (12:11 -0700)
commitfb28c4b30784c4063896412da99a01372f70bd82
treebc154fad7cc4cc5daa0f98afd500541dfe5bdb20
parentf5eb96b5591ee12c9ff6ab73fdc8eff39b27f0ec
parente65271640912ffcc4334b41671ec5ab02bf7064a
Merge from emacs-24; up to r111343
doc/man/ChangeLog
doc/man/emacs.1